Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
863
Issues
863
List
Boards
Labels
Service Desk
Milestones
Merge Requests
50
Merge Requests
50
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
5200343a
Commit
5200343a
authored
12 minutes ago
by
Emiliano Balbuena
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(chore): Feedback
parent
8844ac61
epic/minds-pro
1 merge request
!507
WIP: (feat): Minds Pro (development branch) - Release 3
Pipeline
#77602984
running with stages
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
20 deletions
+28
-20
channel.component.html
src/app/modules/pro/channel/channel.component.html
+6
-7
channel.component.scss
src/app/modules/pro/channel/channel.component.scss
+1
-0
channel.component.ts
src/app/modules/pro/channel/channel.component.ts
+14
-6
channel.service.ts
src/app/modules/pro/channel/channel.service.ts
+3
-3
list.component.ts
src/app/modules/pro/channel/list/list.component.ts
+3
-3
tile.component.ts
src/app/modules/pro/channel/tiles/media/tile.component.ts
+1
-1
No files found.
src/app/modules/pro/channel/channel.component.html
View file @
5200343a
...
...
@@ -58,18 +58,17 @@
<a
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"
communitie
sRouterLink"
[routerLink]=
"
group
sRouterLink"
routerLinkActive=
"active"
i18n
>
Communitie
s
</a>
>
Group
s
</a>
<ng-container
*ngIf=
"currentUser?.guid != channel.guid; else ownerNavLinks"
>
<a
class=
"m-proChannelTopbar__navItem"
[routerLink]=
"donateRouterLink"
routerLinkActive=
"active"
(click)=
"wire()"
i18n
>
Donat
e
</a>
>
Wir
e
</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
>
Communitie
s
</a>
<a
[routerLink]=
"
groupsRouterLink"
routerLinkActive=
"active"
i18n
>
Group
s
</a>
</li>
<li
class=
"m-dropdownList__item m-proChannelTopbarMenuDropdown__item"
(click)=
"closeMenu()"
>
<a
[routerLink]=
"donateRouterLink"
routerLinkActive=
"active"
>
Donat
e
</a>
<a
(click)=
"wire()"
routerLinkActive=
"active"
>
Wir
e
</a>
</li>
</ng-container>
</ul>
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/channel.component.scss
View file @
5200343a
...
...
@@ -205,6 +205,7 @@ m-pro--channel {
}
a
.m-proChannelTopbar__navItem
{
cursor
:
pointer
;
text-decoration
:
none
;
padding
:
8px
;
font-size
:
13px
;
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/channel.component.ts
View file @
5200343a
...
...
@@ -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
'
communitie
s
'
:
title
.
push
(
'
Communitie
s
'
);
case
'
group
s
'
:
title
.
push
(
'
Group
s
'
);
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
communitie
sRouterLink
()
{
return
this
.
channelService
.
getRouterLink
(
'
communitie
s
'
);
get
group
sRouterLink
()
{
return
this
.
channelService
.
getRouterLink
(
'
group
s
'
);
}
get
proSettingsLink
()
{
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/channel.service.ts
View file @
5200343a
...
...
@@ -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
'
communitie
s
'
:
case
'
group
s
'
:
route
.
push
(
to
);
if
(
params
)
{
...
...
@@ -161,7 +161,7 @@ export class ProChannelService {
route
.
push
(
to
);
break
;
case
'
signup
'
:
case
'
login
'
:
route
.
push
(
'
login
'
);
break
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/list/list.component.ts
View file @
5200343a
...
...
@@ -69,7 +69,7 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
case
'
articles
'
:
this
.
type
=
'
blogs
'
;
break
;
case
'
communitie
s
'
:
case
'
group
s
'
:
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
.
t
ype
as
RouterLinkToType
,
params
))
return
this
.
router
.
navigate
(
this
.
channelService
.
getRouterLink
(
this
.
paramsT
ype
as
RouterLinkToType
,
params
))
}
get
shouldShowCategories
()
{
return
this
.
paramsType
!==
'
communitie
s
'
&&
this
.
paramsType
!==
'
feed
'
;
return
this
.
paramsType
!==
'
group
s
'
&&
this
.
paramsType
!==
'
feed
'
;
}
}
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/tiles/media/tile.component.ts
View file @
5200343a
...
...
@@ -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>
`
})
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment