Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#743 #752

Merged
merged 9 commits into from
Jan 18, 2022
Merged

#743 #752

merged 9 commits into from
Jan 18, 2022

Conversation

LeraKornienko
Copy link
Contributor

done

@dmitryy90 dmitryy90 changed the base branch from main to develop January 13, 2022 07:58
@@ -1,7 +1,13 @@
<div class="container" fxLayout="column"
[fxLayout.lt-lg]="(isMobileScreen$ | async) ? 'column' : 'row wrap'"
[fxLayoutAlign]="(isMobileScreen$ | async) ? 'none' : 'center start'">
<app-actions *ngIf="role !== Role.provider" [role]="role" [workshop]="workshop"></app-actions>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

try to follow general styleguides of the application and fix indentations

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

fix indentations
@@ -28,6 +29,7 @@ export class ActionsComponent implements OnInit, OnDestroy {
@Input() workshop: Workshop;
@Input() role: string;


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this line please

@litvinets
Copy link
Contributor

litvinets commented Jan 14, 2022

wrong implementation. The card should be placed before the workshop-details and workshop images, right under the header
image
It should be like this:
image

LeraKornienko and others added 3 commits January 14, 2022 13:35
images, right under the header + remove line
done
@@ -11,8 +11,9 @@ import { Favorite } from 'src/app/shared/models/favorite.model';
import { CreateFavoriteWorkshop, DeleteFavoriteWorkshop } from 'src/app/shared/store/user.actions';
import { ShowMessageBar } from 'src/app/shared/store/app.actions';
import { ActivatedRoute } from '@angular/router';
import { takeUntil } from 'rxjs/operators';
import { filter, map, takeUntil } from 'rxjs/operators';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove please unused operators

ngOnInit(): void {
this.isMobileScreen$.pipe(
takeUntil(this.destroy$)
).subscribe((boolean) => this.isMobileScreen = boolean)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add type please

Suggested change
).subscribe((boolean) => this.isMobileScreen = boolean)
).subscribe((isMobile: boolean) => this.isMobileScreen = isMobile)

@@ -13,12 +14,24 @@ import { Observable } from 'rxjs';
export class SideMenuComponent implements OnInit {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you added ngOnDesctroy, then you need to add this interface here

Suggested change
export class SideMenuComponent implements OnInit {
export class SideMenuComponent implements OnInit, OnDestroy {

[fxLayoutAlign]="isMobileScreen ? 'none' : 'center start'">
<ng-conteiner *ngIf="!isMobileScreen">
<app-actions *ngIf="(role !== Role.provider)" [role]="role" [workshop]="workshop"
[isMobileScreen$]="isMobileScreen$">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you're passing this value to the child component, why I don't see the Input for it? I see you're using selector in actions.ts, then maybe this input should be removed? Otherwise, remove selector.

@LeraKornienko LeraKornienko merged commit 96441e2 into develop Jan 18, 2022
@LeraKornienko LeraKornienko deleted the #743 branch January 18, 2022 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants