diff --git a/src/app/main/component/user/components/profile/profile.component.html b/src/app/main/component/user/components/profile/profile.component.html
index c3304472bf..d84d59f5c6 100644
--- a/src/app/main/component/user/components/profile/profile.component.html
+++ b/src/app/main/component/user/components/profile/profile.component.html
@@ -1,7 +1,7 @@
-
+
diff --git a/src/app/main/component/user/components/profile/profile.component.ts b/src/app/main/component/user/components/profile/profile.component.ts
index e261fb293a..790eca8ba5 100644
--- a/src/app/main/component/user/components/profile/profile.component.ts
+++ b/src/app/main/component/user/components/profile/profile.component.ts
@@ -14,6 +14,7 @@ import { take } from 'rxjs/operators';
styleUrls: ['./profile.component.scss']
})
export class ProfileComponent implements OnInit, OnDestroy {
+ public currLang: string;
private langChangeSub: Subscription;
public userInfo: EditProfileModel;
public isDesktopWidth: boolean;
@@ -34,6 +35,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
this.subscribeToLangChange();
this.bindLang(this.localStorageService.getCurrentLanguage());
this.checkUserActivities();
+ console.log(this.translate);
}
@HostListener('window:resize') public checkDisplayWidth() {
@@ -59,7 +61,10 @@ export class ProfileComponent implements OnInit, OnDestroy {
}
private subscribeToLangChange(): void {
- this.langChangeSub = this.localStorageService.languageSubject.subscribe((lang) => this.bindLang(lang));
+ this.langChangeSub = this.localStorageService.languageSubject.subscribe((lang) => {
+ this.bindLang(lang);
+ this.currLang = lang;
+ });
}
private checkUserActivities(): void {
diff --git a/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.html b/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.html
index b82e353cd0..da8942db36 100644
--- a/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.html
+++ b/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.html
@@ -5,10 +5,11 @@
{{ 'profile.my-achievements' | translate }}
+
{{ 'profile.see-all' | translate }}
diff --git a/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.scss b/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.scss
index f39ed2bb8c..7f1bf2c42a 100644
--- a/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.scss
+++ b/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.scss
@@ -40,6 +40,11 @@ p {
color: var(--tertiary-light-grey);
line-height: 16px;
position: relative;
+ }
+ }
+
+ div {
+ .see-all-ukr {
bottom: 20px;
}
}
@@ -72,10 +77,10 @@ p {
width: 184px;
.header {
- a:nth-child(2) {
- text-align: right;
- bottom: 1px;
- width: 80px;
+ div {
+ .see-all-ukr {
+ bottom: 0px;
+ }
}
}
diff --git a/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.ts b/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.ts
index 0e80a02f3d..751cfce14a 100644
--- a/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.ts
+++ b/src/app/main/component/user/components/profile/users-achievements/users-achievements.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
import { PROFILE_IMAGES } from 'src/app/main/image-pathes/profile-images';
@Component({
@@ -8,4 +8,5 @@ import { PROFILE_IMAGES } from 'src/app/main/image-pathes/profile-images';
})
export class UsersAchievementsComponent {
public achievementsImages = PROFILE_IMAGES.achs;
+ @Input() currLang: string;
}