Commit 5200343a authored by Emiliano Balbuena's avatar Emiliano Balbuena

(chore): Feedback

1 merge request!507WIP: (feat): Minds Pro (development branch) - Release 3
Pipeline #77602984 running with stages
......@@ -58,18 +58,17 @@
<a
class="m-proChannelTopbar__navItem"
[routerLink]="communitiesRouterLink"
[routerLink]="groupsRouterLink"
routerLinkActive="active"
i18n
>Communities</a>
>Groups</a>
<ng-container *ngIf="currentUser?.guid != channel.guid; else ownerNavLinks">
<a
class="m-proChannelTopbar__navItem"
[routerLink]="donateRouterLink"
routerLinkActive="active"
(click)="wire()"
i18n
>Donate</a>
>Wire</a>
<button
class="m-proChannelTopbar__subscribe"
......@@ -134,14 +133,14 @@
class="m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)="closeMenu()"
>
<a [routerLink]="communitiesRouterLink" routerLinkActive="active" i18n>Communities</a>
<a [routerLink]="groupsRouterLink" routerLinkActive="active" i18n>Groups</a>
</li>
<li
class="m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)="closeMenu()"
>
<a [routerLink]="donateRouterLink" routerLinkActive="active">Donate</a>
<a (click)="wire()" routerLinkActive="active">Wire</a>
</li>
</ng-container>
</ul>
......
......@@ -205,6 +205,7 @@ m-pro--channel {
}
a.m-proChannelTopbar__navItem {
cursor: pointer;
text-decoration: none;
padding: 8px;
font-size: 13px;
......
......@@ -22,6 +22,7 @@ import { SignupModalService } from '../../../modules/modals/signup/service';
import { OverlayModalService } from "../../../services/ux/overlay-modal";
import { ProUnsubscribeModalComponent } from './unsubscribe-modal/modal.component';
import { OverlayModalComponent } from '../../../common/components/overlay-modal/overlay-modal.component';
import { WireCreatorComponent } from '../../wire/creator/creator.component';
@Component({
providers: [
......@@ -30,7 +31,7 @@ import { OverlayModalComponent } from '../../../common/components/overlay-modal/
],
selector: 'm-pro--channel',
templateUrl: 'channel.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
changeDetection: ChangeDetectionStrategy.Default,
})
export class ProChannelComponent implements OnInit, AfterViewInit, OnDestroy {
......@@ -139,8 +140,8 @@ export class ProChannelComponent implements OnInit, AfterViewInit, OnDestroy {
case 'articles':
title.push('Articles');
break;
case 'communities':
title.push('Communities');
case 'groups':
title.push('Groups');
break;
case 'donate':
title.push('Donate');
......@@ -194,7 +195,7 @@ export class ProChannelComponent implements OnInit, AfterViewInit, OnDestroy {
if (!this.session.isLoggedIn()) {
this.router.navigate(
window.Minds.pro ?
this.channelService.getRouterLink('signup') :
this.channelService.getRouterLink('login') :
['/login']
);
......@@ -232,6 +233,13 @@ export class ProChannelComponent implements OnInit, AfterViewInit, OnDestroy {
}
}
wire() {
this.modalService.create(WireCreatorComponent,
this.channelService.currentChannel,
{ onComplete: () => {} }
).present();
}
@HostBinding('style.backgroundImage') get backgroundImageCssValue() {
if (!this.channel) {
return 'none';
......@@ -328,8 +336,8 @@ export class ProChannelComponent implements OnInit, AfterViewInit, OnDestroy {
return this.channelService.getRouterLink('articles', params);
}
get communitiesRouterLink() {
return this.channelService.getRouterLink('communities');
get groupsRouterLink() {
return this.channelService.getRouterLink('groups');
}
get proSettingsLink() {
......
......@@ -10,7 +10,7 @@ import { BlogView } from "../../blogs/view/view";
import { Session } from '../../../services/session';
import { ActivatedRoute } from '@angular/router';
export type RouterLinkToType = 'home' | 'all' | 'feed' | 'videos' | 'images' | 'articles' | 'communities' | 'donate' | 'signup';
export type RouterLinkToType = 'home' | 'all' | 'feed' | 'videos' | 'images' | 'articles' | 'groups' | 'donate' | 'login';
@Injectable()
export class ProChannelService {
......@@ -149,7 +149,7 @@ export class ProChannelService {
case 'videos':
case 'images':
case 'articles':
case 'communities':
case 'groups':
route.push(to);
if (params) {
......@@ -161,7 +161,7 @@ export class ProChannelService {
route.push(to);
break;
case 'signup':
case 'login':
route.push('login');
break;
}
......
......@@ -69,7 +69,7 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
case 'articles':
this.type = 'blogs';
break;
case 'communities':
case 'groups':
this.type = 'groups';
break;
case 'feed':
......@@ -186,10 +186,10 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
params = { hashtag: tag };
}
return this.router.navigate(this.channelService.getRouterLink(this.type as RouterLinkToType, params))
return this.router.navigate(this.channelService.getRouterLink(this.paramsType as RouterLinkToType, params))
}
get shouldShowCategories() {
return this.paramsType !== 'communities' && this.paramsType !== 'feed';
return this.paramsType !== 'groups' && this.paramsType !== 'feed';
}
}
......@@ -5,7 +5,7 @@ import { Component, Input } from '@angular/core';
template: `
<img [src]="entity.thumbnail_src">
<div class="m-proChannelTile__text" *ngIf="getTitle() || getText()">
<h2>{{getTitle()}}</h2>
<h2 [title]="getTitle()">{{ getTitle() }}</h2>
</div>
`
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment